Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 31 Aug 2010 00:03:58 +0000 (00:03 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 31 Aug 2010 00:03:58 +0000 (00:03 +0000)
commit74403a31130eeb18f2bfa783f2a2b8fd89f01a11
tree9952e7a8eaf503e2ace19dda6562503b7cbd9e66
parentc8b5e7c6848b9f98c04fccc4829572b571b94ed5
parent8f60456f77bdd4b0a10c3fe24475683f81eb9999
Merge from mainline.